From: Florian Müllner <fmuellner@gnome.org>
Date: Sun, 16 Feb 2025 13:36:28 +0000 (+0100)
Subject: ci: Replace Cantarell with Adwaita fonts in toolbox image
X-Git-Tag: archive/raspbian/50.5-1+rpi1~1^2~153^2^2~36
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=6bf52dae1dbcf6a9a98d39d693e86936a7462c2d;p=gnome-shell.git

ci: Replace Cantarell with Adwaita fonts in toolbox image

The default changed, so follow suit. The fonts aren't packaged
in Fedora yet, so use git for now.

Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/3639>
---

diff --git a/.gitlab-ci/build-toolbox-image.sh b/.gitlab-ci/build-toolbox-image.sh
index 982e0f649..e53e8c381 100755
--- a/.gitlab-ci/build-toolbox-image.sh
+++ b/.gitlab-ci/build-toolbox-image.sh
@@ -33,7 +33,6 @@ build_container() {
     flatpak-spawn # run host commands
     flatpak # for host apps
     nautilus # FileChooser portal
-    abattis-cantarell-fonts # system font
     gnome-backgrounds # no blank background!
   )
   local debug_packages=(
@@ -54,6 +53,9 @@ build_container() {
   local srcdir=$(realpath $(dirname $0))
   buildah copy --chmod 755 $build_cntr $srcdir/install-meson-project.sh /usr/libexec
 
+  buildah run $build_cntr /usr/libexec/install-meson-project.sh \
+    https://gitlab.gnome.org/GNOME/adwaita-fonts.git main
+
   # include convenience script for updating mutter dependency
   local update_mutter=$(mktemp)
   cat > $update_mutter <<-EOF